Skip to content

56 user implemention and token. #77

Merged
merged 52 commits into from
Apr 21, 2026
Merged

Conversation

apbaluna
Copy link
Collaborator

Notable Users:

  1. Vanlig Bruker
    email: test@test.com
    passord: test
  2. Charity Bruker
    email: p@p.com
    passord: ppp

AdrianBalunan added 30 commits April 15, 2026 21:34
…aking new controller, to make sure authToken gets based correctly
…ontroller for register). Login needs handling
…he original), to make use of the stage instead of only actionEvent
AdrianBalunan added 22 commits April 20, 2026 16:24
…o to donate, heart and check hearted charities.
…on ) but now frontpage now scrolls and looks nice
…nto 56-user-implemention-and-token

# Conflicts:
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AvailableOrganizationController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/DonationPageController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/BaseController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarFooterController.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java
#	helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java
#	helpmehelpapplication/src/main/resources/fxml/aboutPage.fxml
#	helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
#	helpmehelpapplication/src/main/resources/fxml/donationPage.fxml
#	helpmehelpapplication/src/main/resources/fxml/frontPage.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_org_Inbox.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_org_Settings.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_user_history.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_user_inbox.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_user_interests.fxml
#	helpmehelpapplication/src/main/resources/fxml/profile_user_settings.fxml
@apbaluna apbaluna merged commit ef3b1bf into develop Apr 21, 2026
1 check failed
@apbaluna apbaluna deleted the 56-user-implemention-and-token branch April 21, 2026 13:32
apbaluna added a commit that referenced this pull request Apr 22, 2026
@apbaluna apbaluna linked an issue Apr 22, 2026 that may be closed by this pull request
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Final Delivery: User-implemention
1 participant